From f7a3ec9450a8f4aeb43bfa4ad65636325e756a61 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Fri, 30 Apr 2004 16:19:02 +0000 Subject: [PATCH] bitkeeper revision 1.879.1.8 (40927c76fBFYWVkMyT4Hhbq-SCO6rA) Fix a mismerge. --- tools/examples/xc_dom_create.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/examples/xc_dom_create.py b/tools/examples/xc_dom_create.py index 91fe53217e..0fae2b251b 100755 --- a/tools/examples/xc_dom_create.py +++ b/tools/examples/xc_dom_create.py @@ -261,7 +261,7 @@ def make_domain(): sys.exit() else: - ret = eval('xc.%s_build ( dom=id, image=image, ramdisk=ramdisk, cmdline=cmdline, control_evtchn=xend_response["remote_port"], io_priv=%d )' % (builder_fn, io_priv) ) + ret = eval('xc.%s_build ( dom=id, image=image, ramdisk=ramdisk, cmdline=cmdline, control_evtchn=cons_response["remote_port"], io_priv=%d )' % (builder_fn, io_priv) ) if ret < 0: print "Error building Linux guest OS: " print "Return code = " + str(ret) -- 2.30.2